Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 23 Nov 2011 07:04:48 +0000 (23:04 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 23 Nov 2011 07:04:48 +0000 (23:04 -0800)
commit41c310346344e3bf38c31b284b6baf635f3f6ac8
treed3cb9bc0ec7f679583b4936672f3eef22de52248
parentfec321da6a8e57ebd7f107ff6cb6a4b2e459561b
parentc2d8158391e9a95ccabcecb3159a3c45fd8dbd22
Merge from trunk.